From f0410e789201b3778cfb9c9a2974b5f792b667f4 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 2 Sep 2019 18:17:30 +0100
Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff
---
 config_host.mk.in |   1 +
 configure.ac      | Bin 464962 -> 465250 bytes
 odk/Module_odk.mk |   4 ++++
 3 files changed, 5 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 29448384a2f..e46d63e54aa 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -299,6 +299,7 @@ export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
+export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
diff --git a/configure.ac b/configure.ac
index 62e30891dbdc09def74067ae0f8c15e858772248..fb28f1175c6f3695ba78bc91b7677322fadf52a4 100644
GIT binary patch
delta 211
zcmX@KLFUmWnT8g|7N#xCQ(sLN{J|tQeL@a1r@ohCn4_m(h-*+lkSmZ>$ShVUEzZnK
zS18FyRftM0%2x>Ujn(AhQ~-j^G==H;51AD;(u-0H6m$#0^41`gd0d>FAd})f9E0Pd
zT!Z}M!+dQkxu$QdWK^84u#c5*dW;*B$n*o1jQrCZ+?bT7KTu{7nZ(aNeg7-wQb|YW
o_~1~d;1CUTBc>-hFo#Sxc+bq$KH)Vp5VHU=>-Gt+**56_03?b>&;S4c

delta 53
zcmaE~N#@W7nT8g|7N#xCQ(sLFTF<IA{m5(P(&?(#nS!PVd|>8k-|&VRh*^M`b^C@l
HY@2idmme7X

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 363a8a41dea..bd05d4bba20 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\
 ifneq ($(filter $(OS),LINUX MACOSX),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     CustomTarget_build-examples \
+))
+ifneq ($(JAVA_HAS_ZERO_VM),y)
+$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     $(if $(ENABLE_JAVA),\
         CustomTarget_build-examples_java \
     ) \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
-- 
2.30.2